Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 28 Jul 2010 00:36:24 +0000 (00:36 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 28 Jul 2010 00:36:24 +0000 (00:36 +0000)

Trivial merge